From ef59eb1bc0599dffbb50ad422315d2755534e22c Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 26 Jan 2001 09:22:47 +0000 Subject: [PATCH] (next-line): Don't let `newline' expand abbrevs. Simplify slightly. (open-line): Don't let `newline' expand abbrevs. --- lisp/simple.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 9053b565276..36780f1a0b2 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -141,7 +141,9 @@ With arg N, insert N newlines." (interactive "*p") (let* ((do-fill-prefix (and fill-prefix (bolp))) (do-left-margin (and (bolp) (> (current-left-margin) 0))) - (loc (point))) + (loc (point)) + ;; Don't expand an abbrev before point. + (abbrev-mode nil)) (newline arg) (goto-char loc) (while (> arg 0) @@ -2391,12 +2393,11 @@ using `forward-line' instead. It is usually easier to use and more reliable (no dependence on goal column, etc.)." (interactive "p") (if (and next-line-add-newlines (= arg 1)) - (let ((opoint (point))) - (end-of-line) - (if (eobp) - (newline 1) - (goto-char opoint) - (line-move arg))) + (if (save-excursion (end-of-line) (eobp)) + ;; When adding a newline, don't expand an abbrev. + (let ((abbrev-mode nil)) + (newline 1)) + (line-move arg)) (if (interactive-p) (condition-case nil (line-move arg) -- 2.30.2